Merge from private trunk
authordancol@dancol.org <>
Mon, 10 Dec 2012 20:55:02 +0000 (12:55 -0800)
committerdancol@dancol.org <>
Mon, 10 Dec 2012 20:55:02 +0000 (12:55 -0800)
commit25e99d38308d646c496def12dc29fc0c048cdc96
treecefe467287b2926e1e813fa38d349ba23ff13631
parentf19b3a95cbfdf4eeefe09b7b132fbc5c52106e09
parent97db849f7f78347d9bf364f7641c089553463f08
Merge from private trunk

Daniel Colascione 2012-12-10 Add emacs.res to .bzrignore
Daniel Colascione 2012-12-10 Fix cygw32 build break
ChangeLog